liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
375 Commits 1 Branch 0 Tags
5d88e332a92349a3e103c6003e1dcd66e1b180ed
Commit Graph

375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jlfuqj
5d88e332a9 2.2.0 2022-09-23 14:45:00 +00:00
jlfuqj
f74ec9743e Merge branch 'master-dictProvincesCode-childCompany' into 'master' 
修改方法，添加条件

See merge request eshop/biz_service_ebtp_project!3
 2022-09-23 06:41:59 +00:00
jlfuqj
3dee1d86f9 Merge branch 'uat-put&delete' into 'master' 
put&delete

See merge request eshop/biz_service_ebtp_project!2
 2022-09-23 06:38:13 +00:00
jlfuqj
6d9e9df5c9 Merge branch 'master-jasypt' into 'master' 
jasypt

See merge request eshop/biz_service_ebtp_project!1
 2022-09-23 06:37:54 +00:00
fuqingji
329250fd45 jasypt 2022-09-22 11:20:06 +08:00
fuqingji
7a1926d459 修改方法，添加条件 2022-09-16 09:29:40 +08:00
fuqingji
5c5ac6f11f 修改实体 2022-06-25 15:03:48 +08:00
付庆吉
f3a58a66a7 Merge branch 'uat' into 'master' 
修改实体

See merge request eshop/biz_service_ebtp_project!65
 2022-06-25 14:53:00 +08:00
fuqingji
aab8636182 修改实体 2022-06-25 14:52:37 +08:00
付庆吉
4eaf098d53 Merge branch 'uat' into 'master' 
修改实体

See merge request eshop/biz_service_ebtp_project!64
 2022-06-25 14:41:26 +08:00
fuqingji
ba03f227cc 修改实体 2022-06-25 14:40:38 +08:00
fuqingji
a82484d05c put&delete 2022-06-13 09:58:29 +08:00
fuqingji
05ee0d1f89 修改竞拍委托物资实体 2022-06-09 16:23:17 +08:00
fuqingji
40dd43dff2 修改竞拍委托物资实体 2022-06-02 15:09:40 +08:00
张芹彬
ef792e317f Merge branch 'master' into 'uat' 
# Conflicts:
#   src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java
#   src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
 2022-05-27 13:59:18 +08:00
张芹彬
e3be7b7e10 Merge branch 'dev' into 'uat' 
Dev

See merge request eshop/biz_service_ebtp_project!61
 2022-05-24 14:53:09 +08:00
zhangqinbin
5fc75448db 修改委托非法字符校验，区分名称和编号校验字符 2022-05-24 14:51:49 +08:00
付庆吉
eec9d2ee87 Merge branch 'uat-examination' into 'uat' 
添加字段

See merge request eshop/biz_service_ebtp_project!60
 2022-05-24 14:42:01 +08:00
zhangqinbin
d81433b8a4 修改委托非法字符校验，区分名称和编号校验字符 2022-05-24 14:41:33 +08:00
fuqingji
3f5e4793de 添加字段 2022-05-24 14:40:36 +08:00
付庆吉
14b0e07607 Merge branch 'uat-examination' into 'uat' 
Uat examination

See merge request eshop/biz_service_ebtp_project!59
 2022-05-23 14:19:39 +08:00
fuqingji
4c2c72fc05 Merge remote-tracking branch 'origin/uat' into uat-examination 2022-05-23 14:18:02 +08:00
fuqingji
3ea757723a bug 2022-05-23 14:09:27 +08:00
张芹彬
a0a31b9d68 Merge branch 'dev' into 'uat' 
对委托项目名称、标段名称、标段编号增加新的非法字符校验

See merge request eshop/biz_service_ebtp_project!58
 2022-05-23 11:15:08 +08:00
zhangqinbin
8be6f5d702 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-23 10:33:15 +08:00
付庆吉
4ec250bae4 Merge branch 'dev' into 'uat' 
Dev

See merge request eshop/biz_service_ebtp_project!57
 2022-05-20 15:53:38 +08:00
fuqingji
e17691b7ff Merge remote-tracking branch 'origin/uat' into uat-examination 2022-05-20 15:49:22 +08:00
付庆吉
45c67660c6 Merge branch 'uat-examination' into 'uat' 
处理查询bug

See merge request eshop/biz_service_ebtp_project!56
 2022-05-20 15:25:14 +08:00
fuqingji
0ffc747203 处理查询bug 2022-05-20 15:24:51 +08:00
付庆吉
5a6ec1a3db Merge branch 'uat-examination' into 'uat' 
增加查询条件

See merge request eshop/biz_service_ebtp_project!55
 2022-05-20 10:07:13 +08:00
fuqingji
f63b7f901c 增加查询条件 2022-05-20 10:06:54 +08:00
付庆吉
1f6228fb63 Merge branch 'uat-examination' into 'uat' 
添加查询条件

See merge request eshop/biz_service_ebtp_project!54
 2022-05-20 09:51:19 +08:00
fuqingji
450e316963 添加查询条件 2022-05-20 09:50:39 +08:00
付庆吉
e57626f3d9 Merge branch 'uat-examination' into 'uat' 
项目增加阶段字段

See merge request eshop/biz_service_ebtp_project!53
 2022-05-20 08:17:51 +08:00
fuqingji
69f481e9f0 项目增加阶段字段 2022-05-19 16:29:28 +08:00
付庆吉
6f64cf6435 Merge branch 'uat-examination' into 'uat' 
Uat examination

See merge request eshop/biz_service_ebtp_project!52
 2022-05-19 10:52:37 +08:00
fuqingji
62ece6a4a8 收藏添加查询参数 2022-05-19 10:49:38 +08:00
zhangqinbin
cfb8cee6f7 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-18 10:57:22 +08:00
zhangqinbin
60d467de48 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-18 10:37:47 +08:00
zhangqinbin
8b5ca5f037 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-18 10:23:32 +08:00
zhangqinbin
dfd3a18175 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-18 10:03:20 +08:00
张芹彬
bbcf6dc8b9 Merge branch 'uat' into 'dev' 
测试非法字符配置apollo

See merge request eshop/biz_service_ebtp_project!51
 2022-05-18 09:02:06 +08:00
zhangqinbin
9923474171 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-18 08:58:59 +08:00
liuh
32104533ea add 项目编号 2022-05-17 14:55:13 +08:00
liuh
a54c2f42db add 项目编号 2022-05-17 14:54:42 +08:00
付庆吉
0f024cd9c5 Merge branch 'uat-examination' into 'uat' 
审查人员列表及公开项目

See merge request eshop/biz_service_ebtp_project!50
 2022-05-17 11:08:03 +08:00
fuqingji
10ac94089f 审查人员列表及公开项目 2022-05-17 11:04:40 +08:00
liuh
3722039147 Merge branch 'sim' 2022-05-13 20:52:26 +08:00
liuh
eb5363ec1b 根据委托id数组，查询委托表数据 2022-05-13 20:52:14 +08:00
liuh
da49ffd5fb 根据委托id数组，查询委托表数据 2022-05-10 21:30:28 +08:00