parent: 88d6db | patch | commitdiff
Helius
2021-11-08 9d1fa7183a25cbef2c6de82fd1f75da4f2353173
refs
author Helius <wangdoubleone@gmail.com>
Monday, November 8, 2021 17:03 +0800
committer Helius <wangdoubleone@gmail.com>
Monday, November 8, 2021 17:03 +0800
commit9d1fa7183a25cbef2c6de82fd1f75da4f2353173
tree dc874bc247beeea1aeb5c02d824ad248e6e0696d tree | zip | gz
parent 88d6db9d4a62f1301255d0246db1021b71879224 view | diff
9c791d431038fe79a111805762ee2f42c96b51c5 view | diff 
Merge branch 'ty_fix' into alpha
15 files modified
1 files added
338 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 105 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/LoginDto.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysCompany.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/dao/SysUsersDao.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/SysUsersService.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html 106 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 15 ●●●●● diff | view | raw | blame | history