fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/CodeServiceImpl.java

@@ -116,4 +116,9 @@
   public String getFlowCode() {
      return "F" + getNowTimeString();
   }

   @Override
   public String getCodeByTyle(String typeName) {
      return typeName+getNowTimeString()+ StringUtils.getRandomString(4);
   }
}