java/zhihuishenqu.git

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-27 c7a1a16c8d22b64f9025e800ebaf89b19b530228

refs
用户	yanghui <2536613402@qq.com>
	星期四, 十月 27, 2022 13:14 +0800
提交者	yanghui <2536613402@qq.com>
	星期四, 十月 27, 2022 13:14 +0800
提交	c7a1a16c8d22b64f9025e800ebaf89b19b530228
目录	0b4ba3537c8a852f35e407f09e72eecc7381e036 目录 \| zip \| gz
parent	f40fe15033bc21b05ce626160e623af06bdf8b83 查看 \| 对比 150bacb29c8ce6663e189e254b4e48f6984b4d0e 查看 \| 对比

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

39个文件已修改

	flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java	55 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/OrganizationController.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/controller/UserController.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/application-sms.properties	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/application.properties	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml	47 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/OrganizationChartMapper.xml	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/SysUserMapper.xml	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/TransactionEventMapper.xml	43 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java	30 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml	86 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史