Commit Graph
1517 Commits
Author SHA1 Message Date
lijiarao 75c7e4d5f6 fix 代码没有import 2022-04-12 17:01:38 +08:00
lijiarao 1208be79d4 Merge remote-tracking branch 'origin/2022-4-7'
# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
2022-04-12 15:45:24 +08:00
baozhipeng fa13cfa32a 单点登录 2022-04-11 15:56:26 +08:00
baozhipeng b6af2a6bcb Merge branch 'SingleSignOn' into branch2022-1-4
# Conflicts:
#	db/2022-1-4变更.sql
2022-04-11 15:42:20 +08:00
baozhipeng da385bd445 导入工号 2022-04-11 15:36:43 +08:00
zhangqinlin a94c3bb149 fix:bug 2022-04-11 14:41:25 +08:00
zhangqinlin 0486373d50 同步合同邮寄数据 2022-04-11 14:31:37 +08:00
zhangqinlin 7553bd6673 变更 2022-04-11 13:37:47 +08:00
baozhipeng f6e04a5d1f 导入工号 2022-04-08 18:00:33 +08:00
baozhipeng 5fb04e6b0b 导入工号 2022-04-08 17:59:40 +08:00
baozhipeng eb330fcf17 导入工号 2022-04-08 17:51:14 +08:00
baozhipeng 6ea8df1f08 导入工号 2022-04-08 17:49:34 +08:00
baozhipeng 9d94e412c2 Merge remote-tracking branch 'origin/branch2022-1-4' into branch2022-1-4
# Conflicts:
#	db/2022-1-4变更.sql
2022-04-08 17:46:55 +08:00
baozhipeng 22e540cbf0 导入工号 2022-04-08 17:46:37 +08:00
baozhipeng 5d2578ebfa 导入工号 2022-04-08 17:46:04 +08:00
lijiarao b967391e3c fix 工作组项目增加是否打包查询 2022-04-08 14:42:43 +08:00
zhangqinlin 282af8c456 fix:bug 2022-04-08 11:50:00 +08:00
zhangqinlin a2ed3fcfe5 fix:bug 2022-04-08 10:34:03 +08:00
zhangqinlin 8b96235c29 fix:合同sql 2022-04-08 09:58:56 +08:00
zhangqinlin d66e618b03 fix:bug 2022-04-08 09:51:48 +08:00
zhangqinlin d34c0012fa add:变更 2022-04-07 18:20:59 +08:00
liangqitao e9710d989a 支出合同导入功能修改 2022-04-07 17:24:25 +08:00
liangqitao 5cb764a569 支出合同状态修改 2022-04-07 16:47:36 +08:00
baozhipeng eb8a176d3e 单点登录 2022-04-07 16:19:51 +08:00
liangqitao 4b8a253623 收入合同联系人姓名显示错误修改 2022-04-07 15:48:52 +08:00
liangqitao 4c3e1d6ef0 收入合同联系人姓名显示错误修改 2022-04-07 15:48:12 +08:00
liangqitao e002a174d8 收入合同联系人姓名显示错误修改 2022-04-07 15:43:00 +08:00
liangqitao 0bf00fd589 收入合同联系人姓名显示错误修改 2022-04-07 15:30:50 +08:00
baozhipeng 4e42794bbe 单点登录 2022-04-07 13:51:07 +08:00
baozhipeng 88782644ff 单点登录 2022-04-07 13:49:52 +08:00
baozhipeng 5c66d75392 单点登录 2022-04-07 12:24:14 +08:00
lijiarao d71a5324ea fix 企业变更管理员后之前的管理员的身份没有更新 2022-04-07 11:00:49 +08:00
lijiarao 6e022d30ea update 日志文件 2022-04-07 11:00:45 +08:00
lijiarao 05b36ba46a update 日志文件 2022-04-07 11:00:42 +08:00
zhangqinlin f0a7ffca81 add:变更 2022-04-06 21:46:47 +08:00
lijiarao 49dfea8d24 fix 企业变更管理员后之前的管理员的身份没有更新 2022-04-06 16:02:12 +08:00
zhangqinlin 8034238ee8 fix: 2022-04-06 14:04:15 +08:00
zhangqinlin e0eb7832af add:根据企业名称获取详情 2022-04-06 13:50:26 +08:00
zhangqinlin 18f54719d6 add: 2022-04-06 12:02:37 +08:00
zhangqinlin 04a98b547d fix:46833 2022-04-06 10:45:42 +08:00
zhangqinlin 777fc8d95e add:第三方合同 2022-04-02 18:01:10 +08:00
zhangqinlin a8db9f916b add:合同变更 2022-04-01 18:09:41 +08:00
lijiarao 1ce08f3600 update 日志文件 2022-03-31 11:03:43 +08:00
lijiarao e8393c9b06 update 日志文件 2022-03-31 10:58:28 +08:00
zhangqinlin b7ae0ac05e add:统计变更 2022-03-30 18:39:22 +08:00
lijiarao 16ee8693a1 回滚 2022-03-30 14:13:58 +08:00
lijiarao c5440c5e5f fix 编辑打包的工作组项目成员后,打包状态变为未打包。 2022-03-30 14:12:16 +08:00
lijiarao a281dffe30 update 优化新增证书 2022-03-24 11:45:45 +08:00
lijiarao bd14877588 fix 调用内部接口时去除超时时间 2022-03-18 12:02:23 +08:00
lijiarao 2a91153af0 fix 工作组项目增加是否打包查询 2022-03-17 18:00:44 +08:00