Merge remote-tracking branch 'origin/master'

app/workerapi/controller/LoginController.php

@@ -15,7 +15,6 @@
 namespace app\workerapi\controller;
 
 use app\common\model\master_worker\MasterWorker;
-use app\workerapi\controller\BaseApiController;
 use app\workerapi\logic\LoginLogic;
 use app\workerapi\validate\LoginAccountValidate;
 use app\workerapi\validate\RegisterValidate;
@@ -24,7 +23,7 @@ use app\workerapi\validate\RegisterValidate;
 /**
  * 登录注册
  * Class LoginController
- * @package app\api\controller
+ * @package app\workerapi\controller
  */
 class LoginController extends BaseApiController
 {

app/workerapi/controller/MasterWorkerAgreeController.php

@@ -10,6 +10,12 @@ use app\workerapi\validate\MasterWorkerAgreeValidate;
 class MasterWorkerAgreeController extends BaseApiController
 {
 
+    public function ceshi()
+    {
+        AddAgreementPdf::sendMq('202408181742334617','https://weixiu.zhongdunzhizhao.com/index/agreement/index?code=202408181742334617');
+        dd(1);
+    }
+
     /**
      * 我的协议列表
      * @return \think\response\Json

app/workerapi/logic/GoodsCategoryLogic.php

@@ -23,7 +23,7 @@ class GoodsCategoryLogic extends BaseLogic
             $response = (new WeChatMnpService())->getUnlimitedQRCode(
                 'type=2&id='.$params['id'].'worker_number='.$params['user_info']['worker_number'],
                 "pages/good/good",
-                'trial',
+                'release',
                 false
             );
             $qrcode = $response->getContent();