Merge remote-tracking branch 'origin/master'

zzw

2023-11-13 8a7246e2afb3b718948f66ddbaaed2bef33a8830

 zt/core/src/main/java/com/zt/modules/coderule/service/SysCodeRuleService.java

@@ -45,7 +45,7 @@

    public String getNewCode(Map<String, String> map) {
        SysCodeRule codeRule = baseDao.getCodeRule(map);
        String newCodeTemplet = codeRule.getFunCode();
        String newCodeTemplet = codeRule.getCodeRule();
        if (map.get("projectId")!=null){
            String projectIdentity = baseDao.getProjectIdentity(map.get("projectId"));
            newCodeTemplet = newCodeTemplet.replace("[项目编号]",projectIdentity);