Commit Graph

536 Commits

Author SHA1 Message Date
35c6fdc282 渗透检测-委托用户角色校验,角色编号获取 2023-03-29 09:48:45 +08:00
deb7a12515 渗透检测-委托用户角色校验,角色编号获取 2023-03-29 09:26:55 +08:00
aac230b48e 渗透检测-委托查询接口 根据当前角色查询数据 2023-03-28 14:22:03 +08:00
yss
1322b016bd 询价项目公司信息由inquiryCompany换orgOuName,Purchaser换inquiryOrg 2023-01-11 17:11:27 +08:00
yss
4bddf51e58 公司信息与部门信息交换,从数据上看两个信息是反的 2023-01-11 15:03:49 +08:00
yss
a8019a3ff5 修正委托状态注释 2022-11-08 09:02:51 +08:00
25821de809 Merge branch 'master-purchasing_manager' into 'master'
采购经理查询委托数据

See merge request eshop/biz_service_ebtp_project!5
2022-10-28 01:47:27 +00:00
25af334edc 采购经理查询委托数据 2022-10-28 09:40:34 +08:00
174cf7713a 采购方式字段修改 2022-09-28 16:53:09 +08:00
9e2773e659 询价委托修改标的类型字段,原单个数字,现多个字符串逗号分割 2022-09-27 15:33:06 +08:00
3642968c98 2.2.0 2022-09-23 14:45:12 +00:00
5d88e332a9 2.2.0 2022-09-23 14:45:00 +00:00
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
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
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
329250fd45 jasypt 2022-09-22 11:20:06 +08:00
7a1926d459 修改方法,添加条件 2022-09-16 09:29:40 +08:00
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
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
ba03f227cc 修改实体 2022-06-25 14:40:38 +08:00
a82484d05c put&delete 2022-06-13 09:58:29 +08:00
05ee0d1f89 修改竞拍委托物资实体 2022-06-09 16:23:17 +08:00
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
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
d81433b8a4 修改委托非法字符校验,区分名称和编号校验字符 2022-05-24 14:41:33 +08:00
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
4c2c72fc05 Merge remote-tracking branch 'origin/uat' into uat-examination 2022-05-23 14:18:02 +08:00
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
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
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
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
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
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
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
62ece6a4a8 收藏添加查询参数 2022-05-19 10:49:38 +08:00
cfb8cee6f7 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-18 10:57:22 +08:00
60d467de48 对委托项目名称、标段名称、标段编号增加新的非法字符校验 2022-05-18 10:37:47 +08:00