FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661 Commits 1 Branch 0 Tags
67dc9c829a2d952b4f65ee6cefccc87a72d6ecc3
Commit Graph
661 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yanyizhou 67dc9c829a Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-23 09:47:05 +08:00
yanyizhou 23365ffa16 标准拆分，拆分之后分解单里也有数据 2021-08-20 21:50:40 +08:00
super_liu a242b9ac56 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the Buss and Convert

See merge request !120
 2021-08-20 10:12:39 +00:00
super_liu fe89ba9c60 feat: There is no way the Buss and Convert 2021-08-20 18:12:08 +08:00
yuezhihang 27e72dca2e 征求意见 数据 2021-08-20 17:49:34 +08:00
yuezhihang e4c66d74a2 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-20 15:20:54 +08:00
yuezhihang dcfedac4bf 标准征求意见流程汇总 2021-08-20 15:20:33 +08:00
super_liu 1363a5b5af Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !119
 2021-08-20 07:06:16 +00:00
super_liu aaa9598735 feat: There is no way the !!! 2021-08-20 15:05:24 +08:00
zhaokaiyao@91isoft.com ebfde8bd52 定时标准预警 2021-08-20 14:33:29 +08:00
super_liu 944df917a3 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !118
 2021-08-20 06:14:10 +00:00
super_liu c89a90757c Merge branch 'develop_master' into develop_migration 2021-08-20 14:09:13 +08:00
super_liu d176d93d6b feat: There is no way the Buss and Convert 2021-08-20 14:07:37 +08:00
zhaokaiyao@91isoft.com cec843270f Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-20 12:19:22 +08:00
super_liu 38690f92b6 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-20 12:01:15 +08:00
super_liu 4abeb55cf3 feat: There is no way the scheduled conf 2021-08-20 12:00:56 +08:00
yanyizhou afe965d44e Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
 2021-08-20 10:57:25 +08:00
yanyizhou 00b5eb0760 标准法规清单发布/流程--FileName没传值 2021-08-20 10:56:46 +08:00
yanyizhou 13a4a1d98f 标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制 
修改完毕
 2021-08-20 09:50:50 +08:00
yanyizhou 1155199e13 标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制 
当前的是修改的限制
 2021-08-19 23:00:00 +08:00
yuezhihang 019ca93736 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-19 16:51:11 +08:00
yuezhihang 66edfd1afc 清单 附件回显 2021-08-19 16:51:03 +08:00
zhaokaiyao@91isoft.com 6c6d99f088 写了点注释 2021-08-19 16:42:10 +08:00
2510220824 b5102e1783 add:更改restTemplate 2021-08-19 16:32:45 +08:00
yanyizhou 564d5657a0 .detailedListVision("v0")去掉 2021-08-19 14:51:10 +08:00
super_liu 7c7be1065c feat: There is no way the WebMvcConfigurer 2021-08-19 11:35:10 +08:00
super_liu c9d0b60863 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-19 11:24:58 +08:00
super_liu 5335230dce feat: There is no way the @CrossOrigin 2021-08-19 11:24:41 +08:00
super_liu 97b1b92acc Merge branch 'develop_master' into develop_migration 2021-08-19 10:52:59 +08:00
yuezhihang b7589984e8 清单 流程回退 2021-08-19 10:51:37 +08:00
super_liu 5a6693fd68 feat: There is no way the 2021-08-19 10:46:58 +08:00
yuezhihang 7d18b3ff7c Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-19 10:41:20 +08:00
super_liu bc1a9e8241 feat: There is no way the 2021-08-19 10:38:21 +08:00
super_liu c343a20ae2 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !116
 2021-08-19 02:32:38 +00:00
super_liu 5675671cbf Merge branch 'develop_master' into develop_3 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
 2021-08-19 10:31:25 +08:00
super_liu 0aba76276f feat: There is no way the 2021-08-19 10:26:31 +08:00
yanyizhou 732ee46c3e Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-19 10:04:23 +08:00
yanyizhou 4e588e6579 恢复代码 2021-08-19 10:04:09 +08:00
yuezhihang cdb3a9ccd4 bug修复 !!! 2021-08-19 09:25:29 +08:00
yanyizhou 801eea7e50 标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制 
还有标准清单的回显
 2021-08-18 22:09:12 +08:00
yanyizhou d457a93c13 标准法规清单新增限制 2021-08-18 19:16:52 +08:00
yanyizhou 89a136ee60 国家地区新增限制 2021-08-18 16:55:20 +08:00
yanyizhou abbf9c257f Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-18 16:44:36 +08:00
zhaokaiyao@91isoft.com 01d0da14e8 Merge remote-tracking branch 'origin/develop_3' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-08-18 16:42:28 +08:00
super_liu bed2c167d9 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-18 16:31:16 +08:00
super_liu 150e2c96d2 feat: There is no way the User Menu auth 2021-08-18 16:30:58 +08:00
Mr.Z dd6b2e76f9 之前的bug重新提交(T_T)~~~~ 2021-08-18 16:19:40 +08:00
yuezhihang 508c292200 配置文件 2021-08-18 15:15:06 +08:00
yuezhihang af1ffe9313 解读入库 2021-08-18 14:44:27 +08:00
yuezhihang 39561c91d2 代码部分恢复 2021-08-18 14:38:00 +08:00