Commit Graph

573 Commits

Author SHA1 Message Date
lvleigang dae8255a93 主数据下发修改业务调整 2024-07-17 14:20:28 +08:00
lvleigang 5de635b0cb Merge branches 'dev' and 'yuecheng-project' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-15 14:45:21 +08:00
13758950345 740f3a593e Merge pull request '主数据下发修改业务调整' (#45) from lvleigang into dev
Reviewed-on: http://ufidahz.com.cn:9015/root/kangarooDataCenterV3/pulls/45
2024-07-15 14:38:17 +08:00
lvleigang a2f046ae90 主数据下发修改业务调整 2024-07-15 14:36:12 +08:00
lvleigang f0583e8967 主数据调整xml保存为空的情况 2024-07-12 16:43:43 +08:00
lvleigang 1dc6df02f6 主数据调整xml保存为空的情况 2024-07-12 16:26:04 +08:00
lvleigang 0d8c43fb46 修改表字段回滚失败,调整语句先后顺序,金额类型默认8位小数 2024-07-11 11:48:39 +08:00
lvleigang c96e1f2f70 保存日志自动添加排序 2024-07-11 10:43:47 +08:00
lvleigang 4912b61ae4 修改宁波银行自定义接口的返回格式 2024-07-11 09:12:14 +08:00
lvleigang d93acb9ffe 修改springboot的版本号 2024-07-11 08:49:12 +08:00
xiang2lin 4ae3c5b623 Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-07-10 16:05:59 +08:00
lvleigang 8d4293d931 Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev 2024-07-10 14:04:39 +08:00
lvleigang d1825d3543 堃博生物OA对接宁波银行 2024-07-10 14:03:09 +08:00
13758950345 9720083622 Merge pull request '系统添加不加在数据库操作' (#44) from xs into dev
Reviewed-on: http://hzya.ufyct.com:9015/root/kangarooDataCenterV3/pulls/44
2024-07-09 15:37:12 +08:00
lvleigang 89cdc2402a 系统添加不加在数据库操作 2024-07-09 15:33:31 +08:00
13758950345 5510601404 Merge pull request '系统添加不加在数据库操作' (#43) from xs into dev
Reviewed-on: http://hzya.ufyct.com:9015/root/kangarooDataCenterV3/pulls/43
2024-07-09 15:31:42 +08:00
lvleigang 2ad4ff5be5 系统添加不加在数据库操作 2024-07-09 15:30:27 +08:00
lvleigang be5923d8ea 修复war打不出来本地jar的问题 2024-07-08 15:43:36 +08:00
yuqh 0f93bce5ba 收款与付款信息 2024-07-08 10:01:35 +08:00
yuqh bcae9c8a05 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-08 10:01:03 +08:00
xiang2lin 17e173392f 测试 2024-07-06 14:51:30 +08:00
xiang2lin 13c5c5dab5 日志service引入
2024年7月5日 15:59:14
2024-07-05 15:59:19 +08:00
xiang2lin afb1b83427 cbs pubKey修改
2024年7月5日 15:46:22
2024-07-05 15:46:26 +08:00
lvleigang 8fc7f351b1 日志 2024-07-05 15:45:07 +08:00
xiang2lin 3f64961d20 cbs pubKey修改
2024年7月5日 15:43:58
2024-07-05 15:44:03 +08:00
lvleigang 9d409413ab 日志 2024-07-05 15:27:21 +08:00
xiang2lin a6555d0c58 打印日志 2024-07-05 13:58:01 +08:00
lvleigang e03491cddd Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-05 13:39:56 +08:00
lvleigang 9f0fefc503 修改主数据 2024-07-05 13:39:35 +08:00
xiang2lin 8bbb653364 初始化参数修改
2024年7月5日 12:42:10
2024-07-05 12:42:14 +08:00
lvleigang 5eee3be6c0 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project
 Conflicts:
	service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java
2024-07-05 11:34:40 +08:00
lvleigang 45d79526ae 修改主数据 2024-07-05 11:33:52 +08:00
xiang2lin 514b7fd387 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-05 11:30:40 +08:00
xiang2lin 4f3ad2e410 打印日志 2024-07-05 11:30:18 +08:00
lvleigang ccfb478ce9 修改主数据 2024-07-05 11:01:49 +08:00
xiang2lin 4df2832c59 打印日志 2024-07-05 10:36:45 +08:00
xiang2lin 4d7763cea5 打印日志 2024-07-05 10:16:07 +08:00
xiang2lin e1b993b580 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-05 10:14:42 +08:00
xiang2lin 9425dcd48a 打印日志 2024-07-05 10:14:33 +08:00
lvleigang 7080685aad Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-05 09:19:16 +08:00
yuqh 86b2808b9c 收付款单 2024-07-05 09:17:46 +08:00
xiang2lin 68083196ee 更新工资发放查询结果时,把支付时间更新到主表
2024年7月4日 16:54:31
2024-07-04 16:54:37 +08:00
xiang2lin 81448dbc47 工资发放主表增加支付时间字段
2024年7月4日 16:53:50
2024-07-04 16:53:56 +08:00
xiang2lin 5550b7fe79 oa数据源编码修改 2024-07-04 16:17:48 +08:00
yuqh 650a7f3dae Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-07-04 16:15:00 +08:00
yuqh 49aaccd8fa 付款单 2024-07-04 16:14:50 +08:00
xiang2lin c034abc1d5 增加oa数据源编码 2024-07-04 16:13:09 +08:00
lvleigang abe1500dde Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-07-04 15:48:52 +08:00
lvleigang 39b999dc6a 修改主数据 2024-07-04 15:47:12 +08:00
xiang2lin 290243f8be 注视没用的代码 2024-07-04 15:44:41 +08:00