Commit Graph

688 Commits

Author SHA1 Message Date
lvleigang 081772d2e3 Merge branch 'fw-bip' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	pom.xml
2024-09-24 15:25:29 +08:00
lvleigang 93727f30b0 Merge branch 'master' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	base-webapp/pom.xml
	pom.xml
2024-09-24 15:24:30 +08:00
lvleigang c1362f563a 修改master依赖 2024-09-24 15:22:55 +08:00
xiang2lin 62cf866111 删除fw-weixin在master上的代码 2024-09-24 11:36:23 +08:00
xiang2lin 351a7e7a7a fix: 注释 fw-weixin的引用 2024-09-24 11:34:27 +08:00
xiang2lin 5f6648144c fix:
去掉没用的依赖
2024-09-24 11:16:02 +08:00
xiang2lin f582a9601c feat: 添加子模块fw-weixin 2024-09-24 11:13:13 +08:00
xiang2lin c398ecde8b feat: 依赖fw-weixin 2024-09-24 11:12:43 +08:00
xiang2lin 0baa4e0bf3 feat: 企业微信单点登录 2024-09-24 11:11:38 +08:00
xiang2lin 3bddc46c9a fix:授权码接口默认设置token 2024-09-24 10:33:12 +08:00
xiang2lin 5ff781e133 feat: 企业微信接口 2024-09-24 08:56:49 +08:00
lvleigang cff92f2399 修改master依赖 2024-09-24 08:54:44 +08:00
lvleigang af75461f14 Merge branch 'master' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into fw-bip
 Conflicts:
	pom.xml
2024-09-20 15:53:13 +08:00
lvleigang 8a8ce95aa6 修改lib目录 2024-09-20 15:52:13 +08:00
lvleigang a778197694 修改适配钉钉单点登录 2024-09-20 15:50:29 +08:00
lvleigang bb524e9831 Merge branches '237master' and 'master' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master 2024-09-20 09:57:01 +08:00
lvleigang 61b0cdfaee 主数据显示查看数据格式功能 2024-09-20 09:54:27 +08:00
lvleigang fa2583176e Merge branch 'master' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 2024-09-19 08:39:09 +08:00
username 165e548056 消息推送模块代码更新 2024-09-18 16:51:20 +08:00
lvleigang d9405aad90 dev默认端口修改为10086,同步修改代码获取url地址方法 2024-09-14 16:59:04 +08:00
476474485@qq.com 2874005465 Merge remote-tracking branch 'origin/master' 2024-09-14 16:58:03 +08:00
476474485@qq.com 6e0b588959 解决移动端跨域问题 2024-09-14 16:57:45 +08:00
lvleigang 55aa4c4a92 dev默认端口修改为10086,同步修改代码获取url地址方法 2024-09-14 16:30:05 +08:00
476474485@qq.com 44fb1eaca1 编写移动端钉钉登录 2024-09-14 15:21:44 +08:00
lvleigang 92a564b441 237分支结构上传 2024-09-14 14:26:25 +08:00
lvleigang a16b05a9a2 Merge branch 'fw-u9c' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	pom.xml
2024-09-14 14:24:53 +08:00
lvleigang 918848887c Merge branch 'fw-u8c' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master 2024-09-14 14:24:22 +08:00
lvleigang 2c7da04993 Merge branch 'fw-u8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	base-webapp/pom.xml
	pom.xml
2024-09-14 14:24:04 +08:00
lvleigang 96d1531b9a Merge branch 'fw-oa' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master 2024-09-14 14:23:45 +08:00
lvleigang ec223c07cd Merge branch 'fw-ningbobank' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	base-webapp/pom.xml
	pom.xml
2024-09-14 14:23:31 +08:00
lvleigang d1255fb152 Merge branch 'fw-ncc' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master 2024-09-14 14:23:17 +08:00
lvleigang 3f68f17d62 Merge branch 'fw-nc' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	base-webapp/pom.xml
	pom.xml
2024-09-14 14:23:02 +08:00
lvleigang 86d7b13da7 Merge branch 'fw-grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master 2024-09-14 14:22:46 +08:00
lvleigang 6b7821e2f3 Merge branch 'fw-dd' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	base-webapp/pom.xml
	pom.xml
2024-09-14 14:22:30 +08:00
lvleigang cafd94c94f Merge branch 'fw-cbs' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into 237master
 Conflicts:
	base-webapp/pom.xml
	pom.xml
2024-09-14 14:21:36 +08:00
lvleigang 9f0fbc9d45 fw-u9c分支结构上传 2024-09-14 10:21:51 +08:00
lvleigang 2537ece2b1 fw-u8c分支结构上传 2024-09-14 10:17:59 +08:00
lvleigang 1d927c3eaa fw-oa分支结构上传 2024-09-14 10:13:01 +08:00
lvleigang 8b00953f47 fw-oa分支结构上传 2024-09-14 10:08:39 +08:00
lvleigang 988fd14adc fw-ningbobank分支结构上传 2024-09-14 10:03:53 +08:00
lvleigang a177292fe1 fw-ncc分支结构上传 2024-09-14 09:58:15 +08:00
lvleigang e11cf4b083 fw-nc分支结构上传 2024-09-14 09:53:23 +08:00
lvleigang 0fbc2b3679 fw-grpU8分支结构上传 2024-09-14 09:49:03 +08:00
lvleigang 7b372f3d0b fw-dd分支结构上传 2024-09-14 09:23:19 +08:00
lvleigang 333904fc99 fw-cbs分支结构上传 2024-09-14 09:17:10 +08:00
lvleigang 85e1821f75 fw-bip分支结构上传 2024-09-14 09:06:23 +08:00
lvleigang f0db5772a2 master分支结构上传 2024-09-14 08:52:25 +08:00
lvleigang 482f0533c4 修改结构是否可以启动 2024-09-13 11:26:12 +08:00
lvleigang 6e6d219719 修改结构是否可以启动 2024-09-13 11:25:17 +08:00
lvleigang 0e471d20a3 修改结构 2024-09-13 09:45:32 +08:00