parent: 9fbd15 | patch | commitdiff
xin
2025-06-03 95dc030ad8e77303207a1a42a3afd9a7a6612d75
refs
author xin <1099200748@qq.com>
Tuesday, June 3, 2025 18:43 +0800
committer xin <1099200748@qq.com>
Tuesday, June 3, 2025 18:43 +0800
commit95dc030ad8e77303207a1a42a3afd9a7a6612d75
tree 9235830c3e419adc0f8e9c0623f58f2fa6b539e3 tree | zip | gz
parent 9fbd156fa0eb3091dd033c3eebf5fbc53c6ab6de view | diff
4665bbe6624452c2aeac8cffbc2a82ece893c9b4 view | diff 
Merge remote-tracking branch 'origin/master' into xin

# Conflicts:
#	oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java
1 files added
1 files renamed
35 files modified
525 ■■■■■ changed files
oying-common/src/main/java/com/oying/utils/ConstantsKey.java 5 ●●●●● diff | view | raw | blame | history
oying-common/src/main/java/com/oying/utils/R.java 2 ●●●●● diff | view | raw | blame | history
oying-generator/src/main/java/com/oying/rest/GenConfigController.java 9 ●●●●● diff | view | raw | blame | history
oying-generator/src/main/java/com/oying/rest/GeneratorController.java 42 ●●●●● diff | view | raw | blame | history
oying-logging/src/main/java/com/oying/rest/SysLogController.java 27 ●●●●● diff | view | raw | blame | history
oying-system/pom.xml 1 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/AppRun.java 1 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryCustomerController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java 4 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java 3 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/search/rest/StoreSearchController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryController.java 3 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java 3 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCustomerController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java 12 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationCustomerController.java 3 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationMerchantController.java 2 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/quartz/rest/QuartzJobController.java 37 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java 18 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java 8 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/security/rest/VerificationController.java 3 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/DeptController.java 36 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/DictController.java 30 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/DictDetailController.java 30 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/JobController.java 26 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java 42 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java 3 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/RoleController.java 43 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/UserController.java 67 ●●●●● diff | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/system/rest/VerifyController.java 7 ●●●●● diff | view | raw | blame | history
oying-tools/src/main/java/com/oying/rest/EmailController.java 14 ●●●●● diff | view | raw | blame | history
oying-tools/src/main/java/com/oying/rest/LocalStorageController.java 28 ●●●●● diff | view | raw | blame | history