parent: 549465 | patch | commitdiff
Helius
2022-03-03 e213e39be2f626ce052abb5bd1582d48059177ba
refs
author Helius <wangdoubleone@gmail.com>
Thursday, March 3, 2022 10:55 +0800
committer Helius <wangdoubleone@gmail.com>
Thursday, March 3, 2022 10:55 +0800
commite213e39be2f626ce052abb5bd1582d48059177ba
tree 7ffbcb4ff76dcb3eeae402062c5e260b8996469b tree | zip | gz
parent 549465d2f3a9c86da2e02d8cd77f12618f1b7eee view | diff
41f0e9d83e4b8b36618f11ab35d889c028f52ab7 view | diff 
merge developer
9 files added
2 files deleted
45 files modified
1502 ■■■■■ changed files
zq-erp/pom.xml 47 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/tools/CodeUtil.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/tools/JSONUtil.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/ueditor/ActionEnter.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/ueditor/ConfigManager.java 37 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/ueditor/UeditorProperties.java 64 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/EnvironmentHolder.java 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/PropertiesUtil.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/UeditorController.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/PropertiesConstance.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tools/UploadUtil.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java 39 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/AchieveNewStatisticsDto.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-alpha.properties 167 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-local.properties 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-meidu.properties 68 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-taiyan.properties 69 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-test.properties 76 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 127 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/config.json 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/system.properties 109 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/readme-jyy 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/权限 2 ●●●●● diff | view | raw | blame | history