Commit Graph

220 Commits

Author SHA1 Message Date
8d05bab236 fix 2023-11-09 09:35:29 +08:00
a8adfcec05 submit 2023-11-08 14:16:04 +08:00
ccab86f526 submit 2023-11-08 14:15:18 +08:00
f17870d8b2 remove ignored_dir 2023-11-08 14:14:55 +08:00
ea0be4daf5 解决冲突,保留远程版本 2023-11-08 14:12:24 +08:00
e57139eb34 submit 2023-11-08 14:05:56 +08:00
3214344fe7 submit 2023-11-08 14:05:09 +08:00
077a989124 fix 2023-11-07 17:49:16 +08:00
3c59d0b13e Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality 2023-11-07 17:48:27 +08:00
2b4669ebc6 submit 2023-11-07 17:48:11 +08:00
68151cf082 submit 2023-11-07 17:23:12 +08:00
af910dd9f4 submit 2023-11-07 17:13:41 +08:00
87dae100b1 Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality 2023-11-07 17:09:06 +08:00
1ad9c04e6b submit 2023-11-07 17:07:51 +08:00
7a8da59189 fix 2023-11-07 17:04:59 +08:00
e9f1a6e3b0 submit 2023-11-07 17:04:32 +08:00
31f7d166d1 submit 2023-11-07 17:03:41 +08:00
7dacc5d9bc fix 2023-11-07 17:01:24 +08:00
4619629d2a submit 2023-11-07 17:00:29 +08:00
00c5e89386 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/cameraContext/cameraContext.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/order-details.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/realName/realName.js.map
2023-11-07 16:49:37 +08:00
d7d7582409 submit 2023-11-07 16:25:30 +08:00
e836f8b1fb fix 2023-11-07 14:35:24 +08:00
7337ec6c7b submit 2023-11-06 13:56:42 +08:00
be95612ac5 submit 2023-11-06 13:50:03 +08:00
debb9e148f fix 2023-11-06 09:41:48 +08:00
6ac1b9a92c fix 2023-11-06 09:39:22 +08:00
04ec6d3659 sumit 2023-11-04 13:22:46 +08:00
2145ce9aac submit 2023-11-04 11:27:41 +08:00
f4d49a8935 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/consignment-painting/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order-goods/index.js.map
2023-11-03 14:16:12 +08:00
8d48c107ff submit 2023-11-03 14:15:54 +08:00
47df11c81f fix 2023-11-01 14:51:11 +08:00
bcd7e8d0e3 submit 2023-11-01 11:56:29 +08:00
dd1f40353a fix 2023-10-08 13:57:38 +08:00
41df0afa36 fix 2023-10-08 11:27:02 +08:00
2caa156983 fix 2023-10-08 10:56:46 +08:00
2ab9962bec fix 2023-10-08 10:47:55 +08:00
2fc2804489 submit 2023-10-08 09:55:42 +08:00
2c43332649 submit 2023-10-08 09:53:43 +08:00
8f0169a23d Merge remote-tracking branch 'origin/master' 2023-10-08 09:37:46 +08:00
b19392b045 submit 2023-10-08 09:37:37 +08:00
9a4b91910e fix 2023-10-07 18:08:22 +08:00
8615940d86 fix 2023-10-07 17:54:23 +08:00
8efeb51ae5 fix 2023-10-07 17:52:24 +08:00
e36c5453c2 fix 2023-10-07 17:51:18 +08:00
222d1107cc fix 2023-10-07 17:44:16 +08:00
8084fcdefb submit 2023-10-07 16:36:07 +08:00
bab7d88c7b fix 2023-10-07 16:21:32 +08:00
812db8113b Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality 2023-10-07 16:10:40 +08:00
567a708b38 fdd人脸实名制 2023-10-07 16:10:32 +08:00
d99332822c submit 2023-10-07 15:52:24 +08:00