Commit Graph

162 Commits

Author SHA1 Message Date
xiang2lin 6c48ee967b oa集成cbs 2024-06-17 13:41:57 +08:00
xiang2lin 55f9afdf48 oa对接cbs 2024-06-14 16:49:04 +08:00
xiang2lin ae9eca4c92 去掉没用的引用 2024-06-14 14:03:57 +08:00
xiang2lin 3d74d52f11 bcprov包升级到1.7 2024-06-14 09:46:22 +08:00
xiang2lin 194872dba0 Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-14 09:34:07 +08:00
xiang2lin ecdcd51d75 bcprov-jdk15on-1.70.jar 2024-06-14 09:33:34 +08:00
xiang2lin 1b3dd1392a 测试token 2024-06-13 08:33:45 +08:00
lvleigang 149a5da298 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 10:15:15 +08:00
hecan aa6da4bf77 操作日志 2024-06-11 10:14:38 +08:00
lvleigang 08994cefb1 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 10:05:33 +08:00
hecan e928c8de00 通用数据接口调整 2024-06-11 09:57:29 +08:00
lvleigang 22b32ce6dc Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-11 09:56:48 +08:00
hecan 7998823e69 增加插件编码属性 2024-06-11 09:56:39 +08:00
hecan fa81637f50 获取数据来源插件编码 2024-06-11 09:55:44 +08:00
hecan 603d7331b8 获取数据来源插件编码 2024-06-11 09:00:19 +08:00
hecan d2e75c67c0 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-06-07 11:27:27 +08:00
hecan 5fb8613936 分组 2024-06-07 11:26:18 +08:00
lvleigang 17d406b880 Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into lvleigang 2024-06-07 11:20:11 +08:00
lvleigang ffd75fa893 主数据修改 2024-06-07 11:19:57 +08:00
hecan 2bbfc519b5 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-06-06 10:37:15 +08:00
lvleigang 3ddfc211e3 统一转发接口,如果api地址内包含 http 或者 https 直接使用api完整地址,否则使用 应用接口地址 +api地址 2024-06-06 08:43:01 +08:00
lvleigang df988e6a12 主数据修改 2024-06-06 08:31:59 +08:00
hecan e94581d805 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan
# Conflicts:
#	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
2024-06-05 11:49:25 +08:00
hecan 42a6ed3086 调整通用数据 2024-06-05 11:46:51 +08:00
lvleigang ce8f2063b2 主数据修改 2024-06-05 11:43:40 +08:00
lvleigang 860a8336b5 用户密码修改 2024-06-05 10:13:47 +08:00
lvleigang 57afb4fdbf 用户密码修改 2024-06-05 09:47:47 +08:00
lvleigang 64d53eecf9 主数据修改 2024-06-05 08:47:46 +08:00
lvleigang 25a5c388ce 主数据新建类 2024-06-04 12:12:46 +08:00
lvleigang 64f15e4361 主数据新建类 2024-06-04 09:08:43 +08:00
lvleigang 270d0dc510 主数据新建类 2024-06-03 13:39:57 +08:00
lvleigang 9aceb2f78b 主数据新建类 2024-06-03 13:39:48 +08:00
lvleigang 2741e28ba1 主数据新建类 2024-06-03 08:49:43 +08:00
lvleigang 4d9fdcae7a 修改排序顺序 2024-06-03 08:45:36 +08:00
yuqh cbbb2bdc35 BIP单据与获取token公用方法编写 2024-05-31 16:59:12 +08:00
lvleigang 303e4f1340 修改适配达梦数据源 2024-05-31 16:45:13 +08:00
lvleigang 479cfce7ff Merge branch 'lvleigang' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 2024-05-31 15:26:45 +08:00
lvleigang 22e1047fd9 修改主数据生成类 2024-05-31 15:26:15 +08:00
yuqh 6530caac60 BIP单点登录接口编写 2024-05-31 09:34:50 +08:00
yuqh 2864ee5fba Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-05-31 09:27:29 +08:00
yuqh 4ae596fc38 BIP单据与获取token公用方法编写 2024-05-31 09:27:20 +08:00
lvleigang e5de3e90fd Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-05-31 09:16:43 +08:00
lvleigang 4609a4c91d 修改主数据生成类 2024-05-31 09:16:27 +08:00
lvleigang 478211ad96 修改主数据生成类 2024-05-31 09:12:40 +08:00
xiang2lin 21a81cde5e Merge remote-tracking branch 'origin/lvleigang' into lvleigang 2024-05-30 15:21:21 +08:00
yuqh d4265e51ca BIP单据与获取token公用方法编写 2024-05-30 15:16:59 +08:00
xiang2lin e13746b313 修改扩展方法 2024-05-30 15:13:54 +08:00
hecan ed73b0fbf0 档案对照 2024-05-29 17:21:42 +08:00
hecan 38b8be2709 通用数据 2024-05-29 17:21:14 +08:00
lvleigang 8fa52f957b 修改查询日志顺序 2024-05-29 11:34:34 +08:00