Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue

@@ -76,8 +76,8 @@
          { required: true, message: '请输入流水号', trigger: 'blur' },
          {
            validator: (rule, value, callback) => {
              if (value > this.maxNum) {
                callback(new Error('不能大于最大流水号'));
              if (value < this.maxNum) {
                callback(new Error('不能小于当前最大流水号'));
              } else {
                callback();
              }
@@ -172,12 +172,12 @@
        return acc;
      }, {});

      const arrCode = Object.entries(filteredObj).map(([key, value]) => {
      /*const arrCode = Object.entries(filteredObj).map(([key, value]) => {
        return {
          secOid: key,
          secValue: value
        }
      })
      })*/

      this.ruleFormFlag = Object.values(codeApplyForm).every(value => {
        return value !== null && value !== undefined && value !== '';
@@ -186,17 +186,14 @@
        this.loading=true;
        let params = {};
        params['codeRuleOid'] = this.ruleOid;

        Object.keys(arrCode).forEach((key) => {
          params[key] = arrCode[key];
        Object.keys(filteredObj).forEach((key) => {
          params[key] = filteredObj[key];
        });

        getMaxSerialNumber(params).then(res => {
          this.formModel.maxSecNum = res.data.data;
          this.loading=false;
          this.maxNum=res.data.data
        });

      }
    },

@@ -220,7 +217,6 @@
        }
        return acc;
      }, {});

      const arrCode = Object.entries(filteredObj).map(([key, value]) => {
        return {
          secOid: key,

 Source/UBCS-WEB/src/views/code/code.vue

@@ -3615,4 +3615,5 @@
/* .code-total > .basic-container__card {
    height: 100%;
  } */

</style>

 Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java

@@ -16,7 +16,7 @@
public class SystemLog {

    /**
     * 服务名称
     * 日志所属服务名称
     */
    private String serviceName;

@@ -26,7 +26,7 @@
    private String serviceId;

    /**
     * 日志路径
     * 日志文件所在的路径
     */
    private String logPath;

@@ -43,11 +43,11 @@
    /**
     * 日志创建时间
     */
    private Date createTime;
    private String createTime;

    /**
     * 日志的最后修改时间
     */
    private Date lastmodifier;
    private String lastmodifier;

}

 Source/UBCS/ubcs-ops/ubcs-log/pom.xml

@@ -29,15 +29,15 @@
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-tenant</artifactId>
        </dependency>
        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>ojdbc8</artifactId>
        </dependency>
        <dependency>
            <groupId>cn.easyproject</groupId>
            <artifactId>orai18n</artifactId>
            <version>${orai18n.version}</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.oracle.database.jdbc</groupId>-->
<!--            <artifactId>ojdbc8</artifactId>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>cn.easyproject</groupId>-->
<!--            <artifactId>orai18n</artifactId>-->
<!--            <version>${orai18n.version}</version>-->
<!--        </dependency>-->
        <dependency>
            <groupId>com.vci.ubcs</groupId>
            <artifactId>ubcs-log-api</artifactId>
@@ -50,6 +50,12 @@
            <version>3.0.1.RELEASE</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.vci.ubcs</groupId>
            <artifactId>ubcs-omd-api</artifactId>
            <version>3.0.1.RELEASE</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

    <build>

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/enums/EnumEnum.java

@@ -140,6 +140,10 @@
     * 模板的按钮用途
     */
    CODE_TEMPLATE_BUTTON_USE("codeTemplateButtonUse"),
    /**
     * 各个服务的功能领域中文简介
     */
    SERCIVE_NAME_ROLE("serviceNameRole"),

    ;