Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/dist/cdn/animate/3.5.2/animate.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/avue/2.9.12/avue.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/avue/2.9.12/index.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/axios/1.0.0/axios.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/index.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/theme-chalk/fonts/element-icons.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/theme-chalk/fonts/element-icons.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/element-ui/2.15.6/theme-chalk/index.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.json

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/avue/iconfont.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/index.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.json

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/iconfont/saber/iconfont.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.08b5f281.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.3c4c9f45.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.acbc6cbd.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/bpmn.f922519e.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/codicon.22349029.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.674f50d2.eot

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.af7ae505.woff2

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.b06871f2.ttf

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/fonts/fontawesome-webfont.fee66e71.woff

Binary files differ

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/img/bpmn.1381b44e.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/img/fontawesome-webfont.912ec66d.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/nutflow/wf-design-base/index.umd.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/vue-router/3.0.1/vue-router.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/vue/2.6.10/vue.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/vuex/3.1.1/vuex.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/xlsx/FileSaver.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/cdn/xlsx/xlsx.full.min.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/chunk-vendors.06e716ef.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/fontSize.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/page.e84a6fd9.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/css/views.e99249a9.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/favicon.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/403.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/img/bg/404.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/img/bg/500.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/img/bg/bg.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg1.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg2.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg3.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/bg4.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/cloud.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/img-logo.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/login.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/logo.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/star-squashed.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip1.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip2.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip3.png

Binary files differ

 Source/UBCS-WEB/dist/img/bg/vip4.png

Binary files differ

 Source/UBCS-WEB/dist/img/logo.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-1.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-2.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-3.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/card/card-4.jpg

Binary files differ

 Source/UBCS-WEB/dist/img/mock/cli/1.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/cli/2.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/cli/3.png

Binary files differ

 Source/UBCS-WEB/dist/img/mock/iconfont.png

Binary files differ

 Source/UBCS-WEB/dist/img/pageLogo.jpeg

Binary files differ

 Source/UBCS-WEB/dist/index.html

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/js/chunk-2d0e4caf.ad4e1649.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/js/chunk-vendors.8b0023e5.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/js/page.40fb2624.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/js/views.10975736.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/src/router/avue-router.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/svg/loading-spin.svg

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/util/aes.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/util/font_4017492_2d1qk52m7xp.ttf

Binary files differ

 Source/UBCS-WEB/dist/util/font_4017492_2d1qk52m7xp.woff

Binary files differ

 Source/UBCS-WEB/dist/util/font_4017492_2d1qk52m7xp.woff2

Binary files differ

 Source/UBCS-WEB/dist/util/screen/guge.png

Binary files differ

 Source/UBCS-WEB/dist/util/screen/huohu.png

Binary files differ

 Source/UBCS-WEB/dist/util/screen/screen.css

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/dist/util/screen/screen.js

ÎļþÒÑɾ³ý

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

@@ -1357,7 +1357,7 @@
            required: true,
            trigger: 'blur',
            validator: (rule, value, callback) => {
              const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yy-MM', 'yyyy-MM-dd', 'yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
              const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yyyyMM','yyMM','yyyyMMdd','yyyyMMdd HH:mm:ss','yyMMdd HH:mm:ss','yy-MM', 'yyyy-MM-dd', 'yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
              if (!Formats.includes(this.form.codeDateFormatStr)) {
                return callback(new Error('请输入正确日期格式，例如yyyy-MM-dd（并区分大小写）！'));
              }
@@ -2313,6 +2313,7 @@
    },
    /** ä¸Šç§»ä¸‹ç§»ç­‰æ“ä½œçš„保存*/
    async saveCodeFixedOrClassifyValueOption(condition, editOrderNumdata) {

      //保存对固定码段码值的上移下移移出等操作
      if (condition == "fixedValue") {
        let data = {
@@ -2448,6 +2449,8 @@
          },
          {
            data: [],


            title: "描述",
            fieldType: "text",
            queryField: "description",
@@ -2789,6 +2792,11 @@
    },
    /** æ–°å¢žåŸºç¡€ç æ®µ*/
    async saveOrEditBasicCode() {
      const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yyyyMM','yyMM','yyyyMMdd','yyyyMMdd HH:mm:ss','yyMMdd HH:mm:ss','yy-MM', 'yyyy-MM-dd', 'yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
      if (!Formats.includes(this.form.codeDateFormatStr)) {
        this.$message.error('请检查日期格式！');
        return;
      }
      if (
        this.selectionList[0].oid == null ||
        this.selectionList[0].oid == ""

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java

@@ -230,7 +230,7 @@
     * @return æ‰§è¡Œç»“æžœ
     * @throws VciBaseException å‚数为空，唯一项，必输项不通过时会抛出异常
     */
    @Override
     @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException {
        VciBaseUtil.alertNotNull(codeBasicSecDTO, "需要添加的数据对象",codeBasicSecDTO.getPkCodeRule(),"编码规则的主键");
@@ -272,7 +272,7 @@
        //引用码段的时候，需要判断参照的信息是否正确
        if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){
            if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){
                throw new VciBaseException("引用码段的时候，需要填写 å‚照配置的内容");
                throw new VciBaseException("引用码段的时候，需要填写参照配置的内容");
            }
            try{
                //JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java

@@ -422,7 +422,6 @@
                allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode",user);allCode.setLctid("codeAllCodeLC");}
            );


            Map<String, String> statusMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
            allCodeDOList.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
                s.setLcStatus(statusMap.get(s.getOid()));