hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,172 Commits 42 Branches 0 Tags 35 MiB
Commit Graph

672 Commits

Author SHA1 Message Date
liuy 6a08847659 Merge remote-tracking branch 'origin/lets' into lets 2024-08-21 00:09:04 +08:00
liuy e292217bed 提交代理品牌采购业务逻辑 2024-08-21 00:08:52 +08:00
zhengyf d166ca87b4 丽知：ofs的sku查询接口测试 2024-08-20 21:58:46 +08:00
zhengyf f3fd73bf8e 丽知：调拨出入库流程 2024-08-20 21:58:14 +08:00
lvleigang bd7b4fd77d mongodb 2024-08-20 17:17:25 +08:00
sx 209bb100b0 Merge remote-tracking branch 'origin/lets' into lets 2024-08-20 14:49:55 +08:00
sx 83102fc1ef 客商编码自定义项1 2024-08-20 14:49:29 +08:00
liuy d7f0d1dddc 提交TOB、TOC优化流程 2024-08-19 23:29:47 +08:00
liuy 629965f2a1 Merge remote-tracking branch 'origin/lets' into lets 2024-08-19 23:13:54 +08:00
liuy 39a5fd31aa Merge remote-tracking branch 'origin/lets' into lets 2024-08-19 19:08:22 +08:00
zhengyf 46add53677 丽知：修改：中台转发http 2024-08-19 18:48:43 +08:00
zhengyf a7a30efd9e 丽知：修改：存货档案自动分配修改 2024-08-19 18:48:22 +08:00
zhengyf 49198c1bef 丽知：新增ofs调拨出库单推送u8c调拨订单（流程自动出库） 2024-08-19 18:43:58 +08:00
lvleigang 2f93dded99 报销接口编写 2024-08-19 17:58:43 +08:00
sx cfb5eef150 供应商->客商 2024-08-19 17:15:30 +08:00
liuy d827760a5c 提交TOB退货优化 2024-08-19 14:55:15 +08:00
yuqh d808021db1 基础数据初始化SQL 2024-08-19 10:58:13 +08:00
liuy 3a36ac3550 Merge remote-tracking branch 'origin/lets' into lets 2024-08-19 10:40:30 +08:00
sx 6effaf0f2e spring-lets-plugin.xml更新 2024-08-19 10:39:46 +08:00
liuy eaebb9c90c Merge remote-tracking branch 'origin/lets' into lets 2024-08-19 10:35:14 +08:00
sx 7729f13895 test更新 2024-08-19 10:31:05 +08:00
liuy f2f63867ba Merge remote-tracking branch 'origin/lets' into lets 2024-08-19 10:15:48 +08:00
sx d37e3d4b6f Merge remote-tracking branch 'origin/lets' into lets 2024-08-16 17:37:12 +08:00
zhengyf bc3c3508fa 丽知：新增中台转发根据apicode的推送方法 2024-08-16 16:35:42 +08:00
zhengyf 2707259d5b 丽知：调整入库,调整出库修改 2024-08-16 16:34:47 +08:00
liuy a984bb1ce2 提交代码 2024-08-16 16:27:22 +08:00
liuy a58eeba470 Merge remote-tracking branch 'origin/lets' into lets 
# Conflicts:
#	buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java
 2024-08-16 15:02:44 +08:00
liuy 1f296c2ed5 优化代码流程 2024-08-16 14:59:54 +08:00
zhengyf ca6e3dc0a0 丽知：sku查询,sku分类查询修改 2024-08-16 11:57:11 +08:00
zhengyf 9b88f5dbd1 丽知：sku类名修改 2024-08-16 11:56:43 +08:00
zhengyf 800e8779cd 丽知：ofs出库单请求\响应类修改 2024-08-16 11:56:19 +08:00
zhengyf b490c2e239 丽知：调整出库完善. 2024-08-16 11:55:24 +08:00
sx 6ee242d2a6 更新客商同步 2024-08-16 10:26:34 +08:00
sx 821c26bc3a 更新客商同步 2024-08-16 09:44:16 +08:00
sx db2b5b2b15 Merge remote-tracking branch 'origin/lets' into lets 2024-08-16 09:19:43 +08:00
sx 5200655f93 更改日志 2024-08-16 09:19:24 +08:00
zhengyf 059e95de67 丽知：调拨出入库，调整出入库接口修改。 2024-08-15 18:09:45 +08:00
liuy aeeee1335b 优化TOC、TOB代码逻辑 2024-08-15 16:52:25 +08:00
liuy bfb2049fe8 Merge remote-tracking branch 'origin/lets' into lets 2024-08-15 16:04:00 +08:00
liuy f2c08a520e 提交core 2024-08-15 16:03:22 +08:00
zhengyf d69e1709eb 丽知：OFS新接口调整 2024-08-15 15:33:58 +08:00
lvleigang 6eb4dd9908 报销接口编写，esb转发修改校验规则 2024-08-15 10:18:00 +08:00
sx 4d6f96bb62 xml更改 2024-08-14 12:08:09 +08:00
sx 31a90feed7 新增客商基本，管理Dto 2024-08-14 11:43:23 +08:00
sx 8b647a51f1 Merge remote-tracking branch 'origin/lets' into lets 
# Conflicts:
#	buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
#	buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-sowow-plugin.xml
 2024-08-14 11:38:44 +08:00
sx 171d8bbede 新增客商基本，管理dto 2024-08-14 11:36:30 +08:00
sx acddea8a58 新增客商基本，管理dto 2024-08-14 11:34:47 +08:00
zhengyf 181ca8d7d8 丽知：OFS调整入库单推送U8C其他入库单调整。 2024-08-14 11:17:52 +08:00
sx 761ad617a4 新增客商基本，管理dto 2024-08-14 11:11:43 +08:00
liuy a80fea45ed 提交TOB业务优化流程 2024-08-13 18:21:50 +08:00
zhengyf d5af8daf77 丽知：OFS调整入库单推送U8C其他入库单调整。 2024-08-13 17:53:25 +08:00
zhengyf 09ec6759dc 丽知：新增OFS调整入库单推送U8C其他入库单。 2024-08-13 16:43:20 +08:00
sx eac2ca9b44 店铺，供应商 2024-08-13 13:58:08 +08:00
sx 0f86bbf9da 店铺，供应商同步到u8c客商 2024-08-13 10:10:52 +08:00
sx 17af2e3a73 店铺，供应商同步到u8c客商 2024-08-13 10:03:50 +08:00
sx b997373f1f 店铺，供应商同步到u8c客商 2024-08-13 09:55:08 +08:00
sx 834ab523b3 店铺，供应商同步到u8c客商 2024-08-13 09:38:32 +08:00
zhengyf a8a6843f98 丽知：调拨订单新增。 2024-08-12 18:51:54 +08:00
liuy 31c1ab8a77 Merge remote-tracking branch 'origin/lets' into lets 
# Conflicts:
#	service/src/main/java/com/hzya/frame/ttxofs/basics/ApiDtoCacheMap.java
 2024-08-09 22:41:23 +08:00
liuy 6374eb91a8 调整TOC报错逻辑 2024-08-09 22:38:29 +08:00
zhengyf 8e78c268d0 丽知：新增调拨订单，调拨入库单。 2024-08-09 18:48:11 +08:00
liuy 27b03a6628 "代码更新：确保在flush=false时，重新加载时不会刷新新实体。此修复遵循指定的`flush`参数，以前新实体实例无论`flush`设置如何都会被刷新。现在，EntityClass中的重新加载机制将根据`flush`参数决定是否刷新新实体。 2024-08-09 10:01:03 +08:00
liuy 210eebc4e5 提交TOC流程修改 2024-08-09 09:45:25 +08:00
zhengyf 14fa78f169 丽知：新增存货基本档案自动分配全公司插件 2024-08-08 18:21:42 +08:00
liuy dd75e2cecc 提交本地代码 2024-08-08 16:00:16 +08:00
lvleigang b5f679d45c 237服务器配置转发地址 2024-08-08 10:51:49 +08:00
liuy 913889998e 提交TOC代码到本地 2024-08-08 09:52:22 +08:00
liuy 30d5c9a4af Merge remote-tracking branch 'origin/lets' into lets 2024-08-08 09:50:28 +08:00
zhengyf 72d28c2201 丽知：存货分类接口 2024-08-07 17:51:24 +08:00
zhengyf fe0587f4c2 丽知：新增存货基本档案接口 2024-08-07 14:38:30 +08:00
zhengyf f9f333169f 丽知：货品分类，货品档案 2024-08-07 14:36:07 +08:00
zhengyf 06d9000c40 丽知：新增推送u8c工具类（pk/code）。 2024-08-07 14:35:36 +08:00
lvleigang ee1195cbfa 主数据自动下发，查询三方主键 2024-08-05 15:50:11 +08:00
liuy 8a407b0802 Merge remote-tracking branch 'origin/lets' into lets 2024-08-05 11:37:30 +08:00
zhengyf 83e3f2ba30 丽知：转utf-8 2024-08-05 11:36:59 +08:00
liuy e6ab78d198 Merge remote-tracking branch 'origin/lets' into lets 2024-08-05 10:18:18 +08:00
zhengyf 77b1b87970 丽知：新增存货档案分类 2024-08-02 20:24:52 +08:00
liuy 4464c67e83 提交保存mysql低表代码 2024-08-02 18:16:30 +08:00
liuy 1df32d2ff3 提交到本地仓库 2024-08-01 17:21:55 +08:00
lvleigang 99897ddbb2 调整主数据树形结构上级关联，引用表只保存上级i 2024-08-01 08:51:10 +08:00
lvleigang 4129d738df 调整主数据树形结构上级关联，引用表只保存上级i 2024-08-01 08:50:26 +08:00
lvleigang 9faaafafa9 修改文件上传 2024-07-18 16:19:32 +08:00
lvleigang 62a23e7d77 主数据下发修改业务调整 2024-07-18 15:28:14 +08:00
lvleigang 510b1ec036 主数据下发修改业务调整 2024-07-18 15:02:30 +08:00
lvleigang 01ca0a5c19 主数据下发修改业务调整 2024-07-17 14:22:29 +08:00
lvleigang f0583e8967 主数据调整xml保存为空的情况 2024-07-12 16:43:43 +08:00
lvleigang 2ad4ff5be5 系统添加不加在数据库操作 2024-07-09 15:30:27 +08:00
lvleigang 39b999dc6a 修改主数据 2024-07-04 15:47:12 +08:00
lvleigang c84d5017aa 修改主数据 2024-07-04 13:56:09 +08:00
lvleigang 195846ba99 修改主数据 2024-07-04 13:44:32 +08:00
lvleigang fde35bf879 主数据按钮，保存到菜单表 2024-07-01 11:24:28 +08:00
lvleigang 319bd2ba7a 修改保存数据到任务日志 2024-06-28 15:09:32 +08:00
lvleigang c333f3f84f 修改适配达梦 2024-06-28 14:00:52 +08:00
yuqh 197c7620c5 MDM公用文件 2024-06-28 09:10:29 +08:00
476474485@qq.com 1b2fe8d78a 修改MDM方法，根据表名称获取字段，转换小写后传递数据 2024-06-27 17:07:38 +08:00
xiang2lin 3b772bf43b cbs支付 代发 2024-06-26 17:02:32 +08:00
xiang2lin 466a89e1c4 电子回单临时文件 2024-06-26 15:44:58 +08:00
xiang2lin 6e77825ce2 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-26 15:44:34 +08:00
476474485@qq.com 671ec5475e 增加tlog配置 
https://tlog.yomahub.com/pages/5b7bd2/
 2024-06-26 09:11:01 +08:00
476474485@qq.com c2c3435967 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-26 09:08:24 +08:00
lvleigang 6250ce4a83 修改主数据 2024-06-25 17:20:07 +08:00
xiang2lin 5991883e53 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-25 16:46:46 +08:00
yuqh ef065c3f8c MDM公用文件 2024-06-25 14:08:07 +08:00
xiang2lin 1039fa7295 cbs 2024-06-24 18:52:24 +08:00
yuqh 2208514dc7 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	pom.xml
	service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
 2024-06-24 17:36:00 +08:00
xiang2lin 4d6c7f5d03 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 16:01:05 +08:00
yuqh aedf496c2a MDM公用文件 2024-06-24 16:00:45 +08:00
xiang2lin dce61d024b Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-24 15:42:47 +08:00
lvleigang 9c6996e0ca 数据源添加dm 2024-06-24 13:37:49 +08:00
yuqh 7b8ce8e35a MDM公用文件 2024-06-24 10:30:59 +08:00
yuqh 7b40d8c0dc MDM公用文件 2024-06-24 10:30:23 +08:00
xiang2lin 55161cad35 查询交易明细 2024-06-21 18:36:55 +08:00
yuqh 020c7645ca Merge remote-tracking branch 'origin/yuecheng-project' into yuecheng-project 2024-06-21 17:06:17 +08:00
yuqh 0f8ba6400d OA单据、档案 同步BIP和主数据中心 2024-06-21 17:06:04 +08:00
lvleigang e694304837 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
	service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
 2024-06-21 17:02:07 +08:00
lvleigang 53000de5ae 主数据下发，重新发送 2024-06-21 17:01:11 +08:00
lvleigang 14d1532be3 主数据下发，重新发送 2024-06-21 16:47:04 +08:00
lvleigang 5840c6392b Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 16:46:19 +08:00
lvleigang 37cbcfb620 Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 16:45:59 +08:00
xiang2lin 9c0eabf938 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 15:03:02 +08:00
yuqh 6b0120eb23 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 14:01:51 +08:00
hecan e1adda59ae 客户档案插件以及明细插件 2024-06-21 13:59:12 +08:00
yuqh 0223fd56e5 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-21 09:31:37 +08:00
xiang2lin a4758ac2a4 cbs测试 2024-06-21 09:18:56 +08:00
xiang2lin 6b19e593f6 查询交易明细 2024-06-21 09:15:46 +08:00
xiang2lin 3cc0acb065 查询交易明细 2024-06-21 09:15:29 +08:00
lvleigang 977320833f Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	buildpackage/src/main/resources/application-llg.yml
 2024-06-20 17:16:40 +08:00
lvleigang c6d4f8ad3a 修改澳星url的名称，所有项目都可以使用 2024-06-20 17:15:15 +08:00
lvleigang 8e042a925a 主数据修改 2024-06-20 17:12:16 +08:00
lvleigang c811eaa0e0 Merge branches 'dev' and 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java
	service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml
 2024-06-20 16:43:20 +08:00
lvleigang 353dd95a60 主数据修改 2024-06-20 16:30:37 +08:00
xiang2lin 70e3bdd4a6 插件测试 2024-06-20 14:38:38 +08:00
xiang2lin e699ffa37f 测试 2024-06-20 14:00:40 +08:00
xiang2lin 6a2691ff69 cbs8交易日志查询 2024-06-20 14:00:23 +08:00
xiang2lin 48186afb82 测试方法 2024-06-20 13:56:18 +08:00
xiang2lin 907a5f057f cbs8 插件 2024-06-20 13:51:04 +08:00
xiang2lin 89e2f4326c cbs8 插件 2024-06-20 09:07:18 +08:00
lvleigang 4e94526a30 主数据修改 2024-06-20 08:43:33 +08:00
xiang2lin 20091505d8 测试类 2024-06-19 17:52:32 +08:00
xiang2lin d2a97cd7ad 测试类 2024-06-19 17:02:09 +08:00
xiang2lin 0ca5c75a1a cbs8 插件 2024-06-19 17:01:54 +08:00
xiang2lin 642986b94a cbs8 插件 2024-06-19 16:56:21 +08:00
xiang2lin e4d0f19e02 cbs8插件 2024-06-19 13:47:44 +08:00
lvleigang 772a2e86f5 修改返回默认值 2024-06-19 11:56:42 +08:00
lvleigang 0ba8aebf25 主数据下发，重新发送 2024-06-19 10:16:47 +08:00
xiang2lin 86a977160d Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
# Conflicts:
#	buildpackage/src/test/java/com/hzya/frame/temButtom.java
#	pom.xml
#	service/src/main/java/com/hzya/frame/report/reportManage/service/impl/ReportManageServiceImpl.java
#	webapp/src/main/java/com/hzya/frame/webapp/entrance/controler/EntranceController.java
 2024-06-19 10:15:33 +08:00
xiang2lin e64978e5e9 cbs8插件 2024-06-19 10:06:53 +08:00
lvleigang 2d4b3af64c 主数据下发，重新发送 2024-06-18 17:17:11 +08:00
lvleigang db50cf0c1a 主数据下发，重新发送 2024-06-18 16:29:47 +08:00
xiang2lin fccd328111 测试cbs接口 2024-06-18 10:35:55 +08:00
xiang2lin f0b53a019f cbs8 2024-06-18 10:35:30 +08:00
xiang2lin 82a4353949 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-18 10:17:22 +08:00
xiang2lin 54eb505bda 增加oa数据源编码配置 2024-06-18 09:43:43 +08:00
xiang2lin 444e034511 增加电子回单、交易明细查询配置 2024-06-18 09:17:01 +08:00
xiang2lin 29c560bcfe cbs8 2024-06-18 09:16:47 +08:00
xiang2lin 347eb4e89f 交易明细查询接口 2024-06-18 09:15:50 +08:00
xiang2lin df4f4f584b 电子回单 2024-06-18 09:15:01 +08:00
xiang2lin 74e0f8ae38 增加cbs8电子回单下载临时存放文件夹配置 2024-06-17 15:11:32 +08:00
hecan cbf2fff967 用户档案插件 2024-06-17 15:00:04 +08:00
hecan 92ff85498d 用户档案插件配置 2024-06-17 14:59:51 +08:00
yuqh 72b827fa11 越城公用配置文件 2024-06-17 14:24:03 +08:00
yuqh 4d26dfa435 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	buildpackage/src/main/resources/application-yc.yml
 2024-06-17 14:23:25 +08:00
xiang2lin 4b2a51cb04 越城区配置 2024-06-17 14:21:57 +08:00
yuqh 71c69c4c9c Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 14:17:18 +08:00
hecan 315dc6582a 增加组织和项目插件配置 2024-06-17 14:16:14 +08:00
xiang2lin c89370ac0c cbs8接口 2024-06-17 13:40:41 +08:00
xiang2lin 5723dc440d cbs8插件spring配置文件 2024-06-17 13:40:11 +08:00
yuqh 5b8c6087f2 Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 2024-06-17 11:24:45 +08:00
xiang2lin 5017517684 cbs密钥 2024-06-14 11:22:13 +08:00
hecan cfbda9907c 调整包路径 2024-06-13 10:08:56 +08:00
yuqh 6032e90e25 Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
 2024-06-11 10:49:28 +08:00
yuqh 564b7b6138 BIP单据与获取token公用方法编写 2024-06-11 10:10:37 +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
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 64f8a58ff8 项目档案和组织档案插件 2024-06-11 09:56:18 +08:00
xiang2lin c7c6ab1c4e 越城区配置 2024-06-07 16:12:01 +08:00
xiang2lin fa1e399968 越城区配置 2024-06-07 16:11:17 +08:00
xiang2lin ab2d1b9fc4 越城区配置 2024-06-07 16:08:03 +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
lvleigang 03e4172120 修改适配达梦数据源 2024-05-31 16:48:13 +08:00
lvleigang 303e4f1340 修改适配达梦数据源 2024-05-31 16:45:13 +08:00
lvleigang 22e1047fd9 修改主数据生成类 2024-05-31 15:26:15 +08:00
lvleigang 478211ad96 修改主数据生成类 2024-05-31 09:12:40 +08:00
hecan d6f4e5febb 调整数据库连接地址 2024-05-29 17:20:12 +08:00
yuqh 77ea42d08e BIP单据与获取token公用方法编写 2024-05-29 10:17:40 +08:00
yuqh 314316824c BIP单据与获取token公用方法编写 2024-05-29 10:17:28 +08:00
lvleigang f9f5f5e23f 数据源表添加数据源状态字段，删除统一接口权限认证 2024-05-27 14:21:42 +08:00
lvleigang 09fea1c14c 数据源表添加数据源状态字段，删除统一接口权限认证 2024-05-27 14:11:25 +08:00
hecan 36284043bf 调整数据库地址 2024-05-27 10:46:36 +08:00
lvleigang 8d9c6e3f73 数据库版本研究配置 2024-05-23 16:09:49 +08:00
lvleigang bde253bf45 数据库版本研究配置 2024-05-23 15:33:25 +08:00
xiang2lin 4f76511392 取数修改，不从jsonStr里取 2024-05-17 09:57:58 +08:00
xiang2lin cbe3294e02 修改注释 2024-05-16 16:02:21 +08:00
xiang2lin d33cff5e43 seeyonExt重试插件 2024-05-16 14:13:56 +08:00
xiang2lin 10f26f27fa 增加ax.url配置 2024-05-15 14:58:47 +08:00
yuqh 22defdd0a2 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh 
 Conflicts:
	buildpackage/pom.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java
	service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java
 2024-05-15 14:17:09 +08:00
yuqh fe4aea7112 代码生成 2024-05-15 14:15:26 +08:00
476474485@qq.com fd094d7374 新增积木报表包扫描 2024-05-15 13:40:18 +08:00
476474485@qq.com f148832b67 增加积木报表配置 2024-05-15 11:55:08 +08:00
lvleigang 7ea7351c33 Merge branch 'yingdesai' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang 
 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
 2024-05-15 08:36:59 +08:00
xiang2lin 5b507de06d 主配置文件 增加ax.url配置 2024-05-14 11:22:16 +08:00
lvleigang 1b653ff985 首页代码拷贝到V3 2024-05-13 16:55:28 +08:00
xiang2lin 442a5bccf5 个人配置 2024-05-13 16:45:03 +08:00
476474485@qq.com 5f04f9da66 调整日志级别，放生产服务器的时候级别调整成error，控制台不打印，只记录文件 2024-05-11 14:16:58 +08:00
lvleigang b7c9ddd1b7 重写任务方法，修改统一接口,修改项目启动，任务初始化方法 2024-05-08 14:47:11 +08:00
hecan c3384fdb38 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan 2024-05-07 09:29:51 +08:00
lvleigang 52bc8c26ae 重写任务方法，修改统一接口 2024-05-07 09:26:06 +08:00
hecan 0889fe0d30 调整日志输出路径 2024-05-07 09:04:40 +08:00
hecan eb781a0db1 新增配置文件 2024-05-06 15:19:33 +08:00
476474485@qq.com e846a892d8 调整框架兼容mybatis-plus 2024-04-29 16:14:45 +08:00
lvleigang 845f6b93f2 澳星档案新增 2024-04-28 10:38:58 +08:00
lvleigang 822de45128 澳星档案新增 2024-04-25 13:39:17 +08:00
lvleigang ed310c5802 澳星环境配置 2024-04-25 08:49:15 +08:00
lvleigang d4f6096104 修改请求打包文件名称 2024-04-24 11:14:26 +08:00
476474485@qq.com 63c28ad91b 修复lib内空的jar包导致tomcat启动失败错误 2024-04-22 16:42:56 +08:00
lvleigang 07edf76a7c 修改应用功能的文件位置 2024-04-17 15:09:02 +08:00
lvleigang b3d95b57bd 修改日志文件大小 2024-04-15 09:03:15 +08:00
lvleigang 0487a71ed3 修改数据源位置 2024-04-12 11:59:01 +08:00
lvleigang 4821868a8a 日志输出修改 2024-04-12 11:55:48 +08:00
lvleigang 0bf189797a 数据源初始化修改，日志修改 2024-04-11 14:13:03 +08:00
lvleigang a4ff79ce37 系统代码上传 2024-04-03 17:02:08 +08:00
lvleigang d57dad9774 项目提交 2024-03-26 13:34:31 +08:00